From 895c094a2c740c75e45d3ea9eb3711ab34a65e36 Mon Sep 17 00:00:00 2001 From: Robert Brady Date: Mon, 13 Nov 2000 02:20:52 +0000 Subject: [PATCH] Fall back to "fixed" if we can't get a native font in the right encoding. Mon Nov 13 02:16:33 2000 Robert Brady * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we can't get a native font in the right encoding. --- ChangeLog | 7 ++++++- ChangeLog.pre-2-0 | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-2 | 7 ++++++- ChangeLog.pre-2-4 | 7 ++++++- ChangeLog.pre-2-6 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- gtk/gtkstyle.c | 7 +++++-- 8 files changed, 47 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3de1b7cc00..06a49220fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ +Mon Nov 13 02:16:33 2000 Robert Brady + + * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we + can't get a native font in the right encoding. + Mon Nov 13 00:09:29 2000 Robert Brady * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW respectively. - + Sun Nov 12 19:11:42 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3de1b7cc00..06a49220fc 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,8 +1,13 @@ +Mon Nov 13 02:16:33 2000 Robert Brady + + * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we + can't get a native font in the right encoding. + Mon Nov 13 00:09:29 2000 Robert Brady * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW respectively. - + Sun Nov 12 19:11:42 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3de1b7cc00..06a49220fc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,13 @@ +Mon Nov 13 02:16:33 2000 Robert Brady + + * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we + can't get a native font in the right encoding. + Mon Nov 13 00:09:29 2000 Robert Brady * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW respectively. - + Sun Nov 12 19:11:42 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3de1b7cc00..06a49220fc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,8 +1,13 @@ +Mon Nov 13 02:16:33 2000 Robert Brady + + * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we + can't get a native font in the right encoding. + Mon Nov 13 00:09:29 2000 Robert Brady * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW respectively. - + Sun Nov 12 19:11:42 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3de1b7cc00..06a49220fc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,8 +1,13 @@ +Mon Nov 13 02:16:33 2000 Robert Brady + + * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we + can't get a native font in the right encoding. + Mon Nov 13 00:09:29 2000 Robert Brady * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW respectively. - + Sun Nov 12 19:11:42 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3de1b7cc00..06a49220fc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,8 +1,13 @@ +Mon Nov 13 02:16:33 2000 Robert Brady + + * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we + can't get a native font in the right encoding. + Mon Nov 13 00:09:29 2000 Robert Brady * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW respectively. - + Sun Nov 12 19:11:42 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3de1b7cc00..06a49220fc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,13 @@ +Mon Nov 13 02:16:33 2000 Robert Brady + + * gtk/gtkstyle.c (gtk_style_init): Fall back to "fixed" if we + can't get a native font in the right encoding. + Mon Nov 13 00:09:29 2000 Robert Brady * configure.in: Chinese .pos have been renamed to zh_CN and zh_TW respectively. - + Sun Nov 12 19:11:42 2000 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_next_line): diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 69e9f681c0..bbc760f9be 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -376,8 +376,11 @@ gtk_style_init (GtkStyle *style) { default_font = gdk_font_from_description (style->font_desc); - if (!default_font) - g_error ("Unable to load default font."); + if (!default_font) + default_font = gdk_font_load ("fixed"); + + if (!default_font) + g_error ("Unable to load \"fixed\" font!"); } style->font = default_font; -- 2.30.2